*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fed1e178e32a014b6659dd6decc868d7c45f1f7f..14f99c756fb514fb0bde41cb6a7b561dea9f4bcd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -127,7 +127,6 @@
        * eshell/esh-ext.el (eshell-script-interpreter): Allow whitespace
        after the #! of a shell interpretor specification.
 
->>>>>>> 1.3466
 2002-02-15  Richard M. Stallman  <rms@gnu.org>
 
        * help.el (describe-key-briefly): Make output in INSERT case